]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
dialog: Use Object.assign() for default property value
authorFlorian Müllner <fmuellner@gnome.org>
Sat, 29 Jun 2019 23:03:46 +0000 (01:03 +0200)
committerGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>
Fri, 12 Jul 2019 18:54:49 +0000 (18:54 +0000)
Either Params.parse() or Object.assign() are more concise for providing
default values in object literals (sadly default parameters won't work
here).

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/626

js/ui/dialog.js

index 4989470c475d796fd83b0f1af7772bdf8fb6c0cb..fd0069cad159d2a15d83d1ca61b7f74d77f914a0 100644 (file)
@@ -180,10 +180,8 @@ var MessageDialogContent = GObject.registerClass({
         this._subtitle.clutter_text.set(textProps);
         this._body.clutter_text.set(textProps);
 
-        if (!params.hasOwnProperty('style_class'))
-            params.style_class = 'message-dialog-main-layout';
-
-        super._init(params);
+        let defaultParams = { style_class: 'message-dialog-main-layout' };
+        super._init(Object.assign(defaultParams, params));
 
         this.messageBox = new St.BoxLayout({ style_class: 'message-dialog-content',
                                              x_expand: true,